From 828faaba64884e0f68c48dbb67d663af6b9e6d43 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 30 Oct 2015 12:50:32 -0400 Subject: [PATCH] Adwaita: Update paned styling Adapt to the new element names in the previous commit. This also adds back a selected state which gets used for when the focus is placed on the separator with F8, just so this functionality is not forgotten. --- gtk/theme/Adwaita/_common.scss | 15 +++++++++------ gtk/theme/Adwaita/gtk-contained-dark.css | 18 ++++++++++-------- gtk/theme/Adwaita/gtk-contained.css | 18 ++++++++++-------- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index eb1eb87478..843adac53c 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2934,7 +2934,7 @@ GtkPlacesView { * Paned * *********/ -GtkPaned { // this is for the standard paned separator +paned { // this is for the standard paned separator -GtkPaned-handle-size: 1; // sets separator width @@ -2944,25 +2944,28 @@ GtkPaned { // this is for the standard paned separator margin-right: 0; margin-left: 8px; } - .pane-separator { + separator { background-color: $borders_color; &:backdrop { background-color: $backdrop_borders_color; } } + separator:selected { + background-color: $selected_bg_color; + } } -GtkPaned.wide { // this is for the paned with wide separator +paned.wide { // this is for the paned with wide separator -GtkPaned-handle-size: 5; // wider separator here margin: 0; // no need of the invisible drag area so, reset margin - .pane-separator { + separator { background-color: transparent; border-style: none solid; border-color: $borders_color; border-width: 1px; } - &.vertical .pane-separator { border-style: solid none;} - .pane-separator:backdrop { border-color: $backdrop_borders_color; } + &.vertical separator { border-style: solid none;} + separator:backdrop { border-color: $backdrop_borders_color; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 6b126e29c8..e76f06c9b3 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4075,29 +4075,31 @@ GtkPlacesView .list-row.activatable:hover { /********* * Paned * *********/ -GtkPaned { +paned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; margin: 0 8px 8px 0; } - GtkPaned:dir(rtl) { + paned:dir(rtl) { margin-right: 0; margin-left: 8px; } - GtkPaned .pane-separator { + paned separator { background-color: #1c1f1f; } - GtkPaned .pane-separator:backdrop { + paned separator:backdrop { background-color: #1f2222; } + paned separator:selected { + background-color: #215d9c; } -GtkPaned.wide { +paned.wide { -GtkPaned-handle-size: 5; margin: 0; } - GtkPaned.wide .pane-separator { + paned.wide separator { background-color: transparent; border-style: none solid; border-color: #1c1f1f; border-width: 1px; } - GtkPaned.wide.vertical .pane-separator { + paned.wide.vertical separator { border-style: solid none; } - GtkPaned.wide .pane-separator:backdrop { + paned.wide separator:backdrop { border-color: #1f2222; } /************** diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 8540caf228..75049418bd 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4247,29 +4247,31 @@ GtkPlacesView .list-row.activatable:hover { /********* * Paned * *********/ -GtkPaned { +paned { -GtkPaned-handle-size: 1; -gtk-icon-source: none; margin: 0 8px 8px 0; } - GtkPaned:dir(rtl) { + paned:dir(rtl) { margin-right: 0; margin-left: 8px; } - GtkPaned .pane-separator { + paned separator { background-color: #a1a1a1; } - GtkPaned .pane-separator:backdrop { + paned separator:backdrop { background-color: darkgray; } + paned separator:selected { + background-color: #4a90d9; } -GtkPaned.wide { +paned.wide { -GtkPaned-handle-size: 5; margin: 0; } - GtkPaned.wide .pane-separator { + paned.wide separator { background-color: transparent; border-style: none solid; border-color: #a1a1a1; border-width: 1px; } - GtkPaned.wide.vertical .pane-separator { + paned.wide.vertical separator { border-style: solid none; } - GtkPaned.wide .pane-separator:backdrop { + paned.wide separator:backdrop { border-color: darkgray; } /************** -- 2.30.2